Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 11 May 2010 04:49:14 +0000 (04:49 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 11 May 2010 04:49:14 +0000 (04:49 +0000)
commit07e8705b49ca9acb50e54af54293f2e091ab7039
tree67a4631197a3a4c4001679ad9967971e8d704bf7
parentf532287087e017ada93311f82f9ba0597efb57e6
parent5a4640b813237d86475f6a81c5f36132486b11e0
Merge from mainline.